Auto merge of #4046 - jmatraszek:fix_rust_41797, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 15 May 2017 20:28:27 +0000 (20:28 +0000)
committerbors <bors@rust-lang.org>
Mon, 15 May 2017 20:28:27 +0000 (20:28 +0000)
Change inferring bin's name logic

Should fix rust-lang/rust#41797.


Trivial merge